Enterprise Version
insane small details